switch windows release build from 32 bit to 64 bit (only).

diff --git a/GPSBabel.pro b/GPSBabel.pro
index 5ca3d54dc7864c5b1a02e49ede2011e80c46b146..2b351ba24c708dd0c7aaef8b0947e5f50d1cb06f 100644 (file)
--- a/GPSBabel.pro
+++ b/GPSBabel.pro
@@ -243,7 +243,7 @@ win32 {
 
 win32-msvc* {
   DEFINES += _CRT_SECURE_NO_DEPRECATE
-  QMAKE_CXXFLAGS += /MP -wd4100
+  QMAKE_CXXFLAGS += /MP -wd4100 -wd4267
 }
 
 include(shapelib.pri)

diff --git a/appveyor.yml b/appveyor.yml
index 14829154a552c2ab01b6b47a1de1b937ae4af41c..1b0e4bbc729a61cdc794bcfcbafae6005ee7dad6 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,16 +4,16 @@ version: 1.0.{build}
 
 environment:
   matrix:
-  - arch: x86
-    qt: 5.12\msvc2017
+  - arch: x86_amd64
+    qt: 5.12\msvc2017_64
     flow: nmake
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  - arch: x86
-    qt: 5.12\msvc2017
-    flow: msbuild
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   - arch: x86_amd64
     qt: 5.12\msvc2017_64
+    flow: msbuild
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  - arch: x86
+    qt: 5.12\msvc2017
     flow: nmake
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   - arch: x86
@@ -37,7 +37,7 @@ build_script:
       echo "qt: $env:qt"
       qmake -query
       Get-Location
-      if (($env:flow -eq "nmake") -and ($env:arch -eq "x86") -and ($env:qt -eq "5.12\msvc2017"))
+      if (($env:flow -eq "nmake") -and ($env:arch -eq "x86_amd64") -and ($env:qt -eq "5.12\msvc2017_64"))
       {
         # full build and deploy of our release configuration
         & ".\tools\make_windows_release.ps1" -flow $env:flow -buildinstaller "true"
@@ -71,7 +71,7 @@ deploy_script:
   - ps: |
       $env:projdir=(C:\msys64\usr\bin\bash.exe -c "pwd")
       C:\msys64\usr\bin\bash.exe -lc "cd $env:projdir; ./tools/ci_tokens"
-      if (($env:flow -eq "nmake") -and ($env:arch -eq "x86") -and ($env:qt -eq "5.12\msvc2017") -and ($env:APPVEYOR_REPO_BRANCH -eq "master"))
+      if (($env:flow -eq "nmake") -and ($env:arch -eq "x86_amd64") -and ($env:qt -eq "5.12\msvc2017_64") -and ($env:APPVEYOR_REPO_BRANCH -eq "master"))
       {
         $verid=(Get-Date -UFormat "%Y%m%dT%H%MZ" -Date (Get-Date -Date (git show -s --format="%aI" HEAD)).toUniversalTime()) `
                + '-' + (git rev-parse --short=7 HEAD)

diff --git a/gui/setup.iss b/gui/setup.iss
index 4148c70dc698fdec1de4620555ad04bd19c5c6bf..e41eea576e1b7177ce4164e34fafabbee3a46881 100644 (file)
--- a/gui/setup.iss
+++ b/gui/setup.iss
@@ -25,6 +25,8 @@ AppPublisher=GPSBabel
 AppPublisherURL=https://www.gpsbabel.org\r
 AppSupportURL=https://www.gpsbabel.org\r
 AppUpdatesURL=https://www.gpsbabel.org\r
+ArchitecturesAllowed=x64\r
+ArchitecturesInstallIn64BitMode=x64\r
 DefaultDirName={pf}\GPSBabel\r
 DefaultGroupName=GPSBabel\r
 OutputDir=release\r

diff --git a/gui/setup.iss.in b/gui/setup.iss.in
index 5bf12acbd7e4241b52650fc8a4a9455445f113a8..28b85489b35ded58367676d0338a6bb603cba431 100644 (file)
--- a/gui/setup.iss.in
+++ b/gui/setup.iss.in
@@ -25,6 +25,8 @@ AppPublisher=GPSBabel
 AppPublisherURL=https://www.gpsbabel.org\r
 AppSupportURL=https://www.gpsbabel.org\r
 AppUpdatesURL=https://www.gpsbabel.org\r
+ArchitecturesAllowed=x64\r
+ArchitecturesInstallIn64BitMode=x64\r
 DefaultDirName={pf}\GPSBabel\r
 DefaultGroupName=GPSBabel\r
 OutputDir=release\r

diff --git a/gui/setup.iss.qmake.in b/gui/setup.iss.qmake.in
index 5585a8de102e547b995b269e1206d84590747496..ac1269842288b2cebb6420ff329a323b8f3fe985 100644 (file)
--- a/gui/setup.iss.qmake.in
+++ b/gui/setup.iss.qmake.in
@@ -25,6 +25,8 @@ AppPublisher=GPSBabel
 AppPublisherURL=https://www.gpsbabel.org\r
 AppSupportURL=https://www.gpsbabel.org\r
 AppUpdatesURL=https://www.gpsbabel.org\r
+ArchitecturesAllowed=x64\r
+ArchitecturesInstallIn64BitMode=x64\r
 DefaultDirName={pf}\\GPSBabel\r
 DefaultGroupName=GPSBabel\r
 OutputDir=release\r